some minor changes, sticky fix