fixing magic method
fixing magic method
fixes and improvements