Small changes

Syntax and small method fixes