Added loop macro for infinite loops
Fix bug with completable