misc. improvements