misc. improvements & fixes