Comment cleanup, subscribe form fix