some fixes in controller architecture + core data change functionality