ISSUE #20 - Bug fixes and speedups