general cleaup, updates