minor function rename
minor function rename
updated application id, but it won't make any difference
renamed some functions and squashed some bugs