Added more BBCode Parsing