Bug fixes, still doesn't work