some initial fixes