Commented the whole controller package, made some improvements