small aspects improvements