some fixes and a small feature update