Cleanup
Added polkit
Little improvements