haml pages added, comment functionality updated and model changed