fixed a nastiest bug ever
cut off some functionality (will implement in the next version, honestly :) )