Some small changes, no new features.

Just tabs, not mixed 4-space and tab.
Rewrote some part to make nicer IMO etc, better performance.

No new features or anything, just had some new over after the gym :P