lots of bug-fixes, cool object example working