Commited all extra changes for day
General cleanup