Merch ending (for now) + some updates