Final dev image commit. Many fixes and improvements.