Updated, reworked some little parts.