Beach Updates

Changes made while being without network connection
Beach Updates (2)

just the same as the previous commit, maybe there were too many changes
for just 1 commit.