Finally squashed all bugs