some markup fixed, still needs cleaning up