Few Fixes, Added Firerack