Features fixed, all apparently working