fixed NPE, added spinners,