small fixes & improvements (started)