added context processor and minor changes :)