fix bug + house cleaning