Small updates, basics are almost done