fixes and oprimization