better name initials + minor bug fixes