improvement: added some more stuff