Fixed issues @spaceemotion listed.