cleanup & hash corrections