Fixed style issues & status PENDING didn't work
Merged with marcos branch