Commit 14

Adding radius option to search
Some cleanup/bug fixes