small bugfixes and /next added.