current user test and some small improvements, making stuff private and so