Latest dev fixes included

Quick release with ask the latest fixes and improvements made on the dev branch.

edit: hopefully fixed tagging issue