Integrate and Clean up 4e files
Issue #28

Cleaning up old syntax. Error list narrowed down.