removed dev work
tweaked some things to run better