bug fix
fix for merge?
store&load
shift
some fix
some fixes
Fixed comments