minor improvements, no complete build yet.