more bug fixin'