Fixed bugs, border added, music repeats