Cleaned up some stuff

Added Moss/cleaned up