Small bugfixes
Basic applied markup #15