Add files Housekeeping and fix bugs