Fixed and updated some things by xQx