fixes 1 of #69
fixed 5 of #69