almost complete

lots of changes,expressions and commands