Updates to main - by request from two alphatesters