Fixes to REAMDE and build system