Misc. improvements branch pull