README + Bug Fixes