it's getting usable
added remove feature
minor code adjustements