Minor changes [comments and stuff + manifest]