Finishing Touches

Preparing for Beta, pretty much finished now. Just bug fixed/polish
left.