several small improvements + cleanup