Fixes & improvements (WIP, more to come)