fixed some of the weird constraint issues