Various design updates / too tired to explain