work on fixing the issues described in #13.