- Fixed few bugs