rename
resolve relative paths bug fix
oops
various minor fixes