added a prettier interface and some little things