first bug-squashing commit. testing progressing.