filename cleanup and corrections