0.2.5

Massive Cleanup :)