Major fixes, starting to go towards completion