Fixed bugs

Fixed bugs go here