Bug fixes and clearer code. Now working.