Fixed most prominent errors
WIP Sprint