last minute bug fixes