Basic updates + some bugs fixed.