some fixes and a build for convenience