smaller fixes - is now compiling