some updates and feature improvements