Fixing some bugs, holding for a moment...