added squishy to controllers and some other cleanup