more test and bugfixes
stop flooding console
add location