Fixed bugs with type checking
Added reset slot capability