fixed some of dustymugs suggestions and one bug..