minor performance fixes. and DONE.