Many updates

Still not finished