Fixed a crash and improved some stuff