Fixed parsing FOR. Cleaned up Dummy objects