did some cleanup. some reorganizing. i dont remember what else