Master cake session

Improvements in speed and clarification of id().