Final fixes and now working