Few fixes and improvements all around.