further improvements (WIP)