Debugs and improvements