a bit of cleanup and proper paths for static stuff