bug fixes and performance enhancements

still waiting on input from DevArt regarding eager loading in order to
finish this work