updated some basic stuff and fixed top and bottom things