rack: some more changes