sub comments fixed & and other little things