More specs & fixes