more bugs found and fixed
looking a lot simpler now
examples back to fully functional