some additions and cleanup