Fixing up Xeb's stuff

Went through Xeb's stuff