--code is still broken--
just a few simple updates