major cleanup
Updated currently reading