Last bit of cleanup for now and added error messages to frequency calculator