Fixed

Fixed and Updated some stuff