Should work offline now
Small fixes
Baby
Final tweaks