update, bring inline some fixes and cleanup