refactored
fixed a minor bug
merged doodlestuff_V1.1