Units updated, some bugs fixed