Fixed some issues in classes and added some new