some more ui bugs ironed out.