Small updates

Still not finished.