more stuff - fixed things