#100, #158, #144 final changes