Finished edit weeks and some cleanup