fixes and stuffz. works now for the submission