Improved annotations, comments, debug strings