Small fixes

Added new variables to __init__