updated site; rearranged some stuff