fixes and finished some methods