inventory+time and other additions/fixes