vector fix
vector fix 2
fixed point refactoring
menu refactoring
some clean up