Compass material and Cleanup + Bug Fix