fixed things and cleaned up