Dealt with issue 26. Minor changes and fixes that were overlooked before.