Improve; fix bugs