bug fixes and continued build out