plethora of changes to gui & functionality
merged and fixed one minor error