bug fix overall system & TODO