first beta changes, noted bugs
i