updated comments and stuff