cleans up syntax
adds some Black Diamond Stuff