major fixes and post