0.0.8-SWAG

Major update - code appearance revamped & bugs hopefully fixed