fix save system, bugs, improve display