deleted more things, hope they weren't important