Updates and polish