Fixed some stuff - Thanks IcyPhoenix