fix bug (one import error, one wrong variable name, sorry i pushed too fast :()