fix paths and some cleanup