maintenance - fixed various issues