Fix #55 - dropping aggregate
Fix #51 - Start and Stop recording instructions