fixes

some constrains have problems so they are currently deleted but will be
brought back once i can fix it...