*Moved back reverted changes in lurker and added things for future and todo list --HG-- branch : trunk