fixed some issues and added spanish support