big improvements to regex and Pre styling, fixes objects