Added beep and check in some base changes