Cleaning up + minor fixes