fixes and now working