added method
added method move
fixed warning
stylistic changes