fixed more bugs, now works a little bit
fixed bugs