Improve some basics