Added missing comments, missing listener initialization, totally base specs