Some fixes, adjustments to trading and resources