Added more test values. Fixed some bugs and adjusted a few things.