removed more commented-out code
made things A LOT faster