fixed some technicalities