Updated the showcase, some bug fixes