Various updates. related to #4