Fixes
Added mutable vectors
Added comments