#19 #18 fix +add missing files