couple small things changed and bugs fixados
Merge origin/master