a lot of new updates, closes #9