Resources added. Some bug fixes as well.