Some fixes and improvements have been made