Everything should be fixed! Just documentation left