Some minor improvements;
Started work on inventory;