Commenting and fixing up some bugs
Fixed clashes