other updates, bugs fixed