Reorganized, added small features