cleaned up unused methods, made specs complete