Beta 3 - Cosmetic Fixes