updated and moved some things