Improve comments and kill errors