some fixes and dev dependens