Finished all major fixes.