working on mess and minor changes