Runs faster now, commented code

Probably still room for improvement