changed to current directory and cleaned up abit