further fixes for initial commit