fixes & consistency improvement