minor fixes

preparing for a complete re-write of lemon