minor changes, cakalnica not working yet...