#3

more fixes