Added some more misc. code that will be remove before the next update.