Some new additions, bugfixes