Some updates and hacking...