some fix + some tips