Adding some TODOs :(
Fixing Yii dependency version OMG (and adding some new tags)