cleanup, fixes #26, #10, fixes issue where incorrect name would be pushed