#7

new fixes