cleanup and rearrange. fixed date inconsistency.
more cleaning
clean up temp files, just in case