most upgrades implemented and tweaked a little

dragon not implemented yet