Removed unnecessary boundary coroutine use. Few other minor fixes.