Local-storage support + more comments