Many fixes to many stuff