Comments, fixes, little things