moar markup tweaking