Finished things promised for Beta
Cleaned up code and added clear button