some fixes and features