fixed compilation issue
added some more functionality
moved testfile