Fixed various things