Fixed and tweaked some things