Added code for simple call/return buffer
Added fixes to framework in order to match official framework.