Bug with length of incoming arguments array.
Some more little fixes.