Many misc. improvements