simple bugs
sorting bug fix
class method fix