Alot of fixes and features