adding example basics and bug fixes