Hopefully fixed some things being out of place on some cases.