#152 progressing with bug fixes.