small fixes, fixed basepath