working version (maybe)

minor updates