- fixed issue 43 (resolve issue: resolution=RESOLVED status=Fixed)

- fixed some focusing issues