Stuff and Things

One fix, one suggestion and a lot of access modifiers xD