Fixed nits
Fixed some behaviors