minor additions
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
remove messing ternary and add init to active form