fixed some brokeness