Changed appearance, fixed several bugs