Added Constants and some minor updates