Various updates (#28)