some missing things and cleaned up html