fixes and stuff i think, this was version used for presentation