Cleaning up. Almost ready to go... A few tiny bugs left.