More input checks and a nice beep added