Alot of fixes