first round of changes, things are looking good!