Fixed some other things. Minor cosmetic changes need to be done