cleaned up warnings
fixed OK button
fixed spelling
merged master