Cleaning up master
merging with anna's