markup fixes; todo added