Fix bugs

Location fixed

Added new classes.