pre merge
merged
fixed a few bugs
merged