Improvements, bug cleanup, numbers add correctly