things are going haywire
added a few goodies