applied a few fixes to get back to a working version