fixed some stuff for user friendliness