major update on everything :)