changes and cleanup, working towards unifying items & actions