performance updates; working on #13