more last minute bug fixes