Bug fixes & showcase entry