Bug fixes for straight evaluation. Cleaned code