More updates
Fixed bugs.