Favorite bugs fixed, pre-code resource cleanup commit