improvement, more stuff implemented