Fixed field beeping, spacing issues, general cleanup