ironing out various little issues after merge