fixing potential bugs
body overflow bug fix