build improvements
improved markup syntax