Updated Constants and bug fixes