Misc. improvements and updated documentation