typo
synching models/fixing some bugs