Final fixes and additionals. Everything should work