Minor fixes, transfered __init__ functionality to views