some bug fixes and added some structure to the private area.