Semi Finalized Version

Tweaks completed.