Updated to latest working version

Still left: MYSQL entries for most callbacks but im getting there...