removed hard coded strings, added some more shit