fixed possible overflow, impacts movement
more or less dynamic decoration stuff