added twatt remove functionality
mergin versions
small fix
conflic fix