updates and debugging complete