More error, timestamp and added inline scripts in includes