clean-up __init__
update settings
add base templates