Added comments, debug information