Little bug solved and housekeeping