lil' fix and minor changes