Improvements, cleanup, and updated README