'!' and '@' fixes

Added checks against having subblocks to ! and @ prefixed lines
Added <br /> appension to appropriate @ prefixed lines