Some updates to the code and compiler