fixed more stuff

only problem is in fillRest()