comments and stuff, probably some code changes too