Improved comments, added TODO