Fixes and improvements all around