Demo

Here are the bug fixes and added features. Looking forward to speaking with you again.