Work in progress
fixed some typos and bugs
added more details to mage::log
Merge branch 'cookies' into refactored