some change
fixed a few bugs
merged
some shite