bugs ironed out
consolidated and cleaned up