Some Beautifications

todo separate actor for stats handling