added prophecy, some cleanup
minor changes