some fixes for grtting more pleasure while working