Fix yoyoing springs
Update todos
Name main classes