Added comments, path changes and re-lifting