Updates and Bug Fixes

This addresses #2 and #5.