Fixed some codes and added some more nice-2-haves