fixed up remaining compiler issues that i missed before
some updates after testing out the local version again