Add example asssembly and some bug fixes