refactored code slightly
more minor changes
whatever
that's some shit