more fixes and guess syntax