Fixed and tweaked some stuff